Skip to content

🌱 Bump CAPI in tests to main (v1.11) #3468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 66 commits into from
May 27, 2025
Merged

🌱 Bump CAPI in tests to main (v1.11) #3468

merged 66 commits into from
May 27, 2025

Conversation

@chrischdi
Copy link
Member

@chrischdi chrischdi commented May 15, 2025

What this PR does / why we need it:

Bumps the CAPI controller version used in tests to ~main (nightly 20250514)

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 15, 2025
@k8s-ci-robot k8s-ci-robot requested review from MaxRink and yastij May 15, 2025 07:16
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label May 15, 2025
@chrischdi chrischdi mentioned this pull request May 15, 2025
Closed
@chrischdi chrischdi changed the title 🌱 Bump CAPI in tests to main 🌱 Bump CAPI in tests to main targetting v1.11 May 15, 2025
@chrischdi chrischdi changed the title 🌱 Bump CAPI in tests to main targetting v1.11 🌱 Bump CAPI in tests to main (v1.11) May 15, 2025
@chrischdi
Copy link
Member Author

chrischdi commented May 15, 2025

/hold

for team-cluster-api#91

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 15, 2025
@chrischdi chrischdi force-pushed the pr-bump-capi-to-main branch from 5271286 to 166c60e Compare May 19, 2025 15:40
@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels May 19, 2025
chrischdi added 17 commits May 19, 2025 17:42
@chrischdi
Bump CAPI in tests to main
937afce
@chrischdi
Bump to Go 1.24 and CAPI Go dependencies
d575656
@chrischdi
Use deprecated conditions and patch packages
85879f9
@chrischdi
rename clusterv1 v1beta1 imports to clusterv1beta1
495e91e
@chrischdi
controllers: use deprecated paused pkg
fdeeb87
@chrischdi
part1: use clusterv1.Cluster and Machine
058f61b
@chrischdi
realias deprecated condition package imports
0e7e522
@chrischdi
controlplanev1 update to v1beta2 except test-extension
0994237
@chrischdi
migrate Cluster .status.infrastructureReady to .status.initialization…
9d3f4fc 
….infrastructureProvisioned
@chrischdi
migrate watches to v1beta2 cluster and machine and fixup predicate
fdf20b1
@chrischdi
controllers: fix check on cluster v1beta1 condition
d873806
@chrischdi
test: vcsim: fixup clusterv1 to v1beta2
17aeede
@chrischdi
some more cluster/machine to v1beta2
8aae577
@chrischdi
fixes
74993b3
@chrischdi
fixup printf findings
d4b809a
@chrischdi
fixes
9216b63
@chrischdi
fix using local replace for tests
e553e6a
@chrischdi chrischdi force-pushed the pr-bump-capi-to-main branch from f352deb to 4899d07 Compare May 27, 2025 08:10
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label May 27, 2025
@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

@chrischdi: Overrode contexts on behalf of chrischdi: pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main, pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

In response to this:

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

@chrischdi: Overrode contexts on behalf of chrischdi: pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main, pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

In response to this:

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

fabriziopandini
fabriziopandini reviewed May 27, 2025
View reviewed changes
controllers/vspherecluster_reconciler.go Outdated
ctx = ctrl.LoggerInto(ctx, log)

if conditions.IsTrue(cluster, clusterv1.ControlPlaneInitializedCondition) {
if conditionsv1beta1.IsTrue(cluster, clusterv1.ControlPlaneInitializedV1Beta1Condition) {
Copy link
Member

@fabriziopandini fabriziopandini May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Q: since this is condition from the CAPI cluster object which has an equivalent metav1 condition, what about using the new one?

controllers/vspherecluster_reconciler.go Outdated
clusterutilv1 "sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
conditionsv1beta1 "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
Copy link
Member

@fabriziopandini fabriziopandini May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH, I do not expect CAPV to use this import (see note where this import is used)

As alternative, let's add an import alias so we can track usage.

Copy link
Member Author

@chrischdi chrischdi May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Jep, missed these two occurencies to move to the new conditions :-)

controllers/vspheremachine_controller.go Outdated
clusterutilv1 "sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/conditions"
v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
conditionsv1beta1 "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
Copy link
Member

@fabriziopandini fabriziopandini May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as in the other file, let's consider to transition to v1beta2 conditions when looking at core CAPI objects

sbueringer
sbueringer reviewed May 27, 2025
View reviewed changes
@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

@chrischdi: Overrode contexts on behalf of chrischdi: pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main, pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

In response to this:

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Needs #3473

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@sbueringer
Copy link
Member

sbueringer commented May 27, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 27, 2025
@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

LGTM label has been added.

Git tree hash: 7359ca91228db2799c42d0f112a75ccc35cb41a6

@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

@chrischdi: Overrode contexts on behalf of chrischdi: pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main, pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

In response to this:

/override pull-cluster-api-provider-vsphere-e2e-govmomi-blocking-main
/override pull-cluster-api-provider-vsphere-e2e-supervisor-blocking-main

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/retest

@fabriziopandini
Copy link
Member

fabriziopandini commented May 27, 2025

/lgtm
/approve

Pending CI

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented May 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: fabriziopandini

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 27, 2025
@chrischdi
Copy link
Member Author

chrischdi commented May 27, 2025

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 27, 2025
@sbueringer
Copy link
Member

sbueringer commented May 27, 2025

/retest

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-vsphere/3468/pull-cluster-api-provider-vsphere-e2e-vcsim-govmomi-main/1927373292109303808

@k8s-ci-robot k8s-ci-robot merged commit 568ac33 into kubernetes-sigs:main May 27, 2025
16 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.14 milestone May 27, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sbueringer sbueringer sbueringer left review comments

@fabriziopandini fabriziopandini fabriziopandini left review comments

@MaxRink MaxRink Awaiting requested review from MaxRink

@yastij yastij Awaiting requested review from yastij

Assignees

@sbueringer sbueringer

@fabriziopandini fabriziopandini

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Milestone

v1.14

Development

Successfully merging this pull request may close these issues.

4 participants

@chrischdi @k8s-ci-robot @sbueringer @fabriziopandini